Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 10 Jan 2006 14:24:12 +0000 (14:24 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 10 Jan 2006 14:24:12 +0000 (14:24 +0000)

Trivial merge